Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1