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

Change-Id: I3c8d50d298bc2b49afb3e635aa5794a164a13dda