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