Merge "Merge "Limit maximum allowed size for a status bar icon" into rvc-qpr-dev am: 0ef492ff12 am: 299eda8338" into sc-dev