Merge "Pause drawing when not visible" into ics-mr1