Merge "Limit maximum allowed size for a status bar icon" into pi-dev