Reintroduce shell indicators

Change-Id: I0d9af720169fc19657db1d757e9fe16d4663e0b5
2 files changed