Merge "Volume overlay right padding increased" into ics-mr0