Merge "Increase maximum allowed size for status bar icons" into sc-dev