Merge "Limit number of notification etc dots to 1" into pi-dev