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