Merge "Limit status icons and show etc dots" into pi-dev
am: 909086509c

Change-Id: I1d49128196ebf708ce2a452660d08f385afef932