Merge "Limit number of notification etc dots to 1" into pi-dev am: aa0287603d
am: beb5bc8308

Change-Id: I99fac5724a280dfee2e33ff2bcfdb58a554cd73b