Merge "Limit status icons and show etc dots" into pi-dev