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