Merge "Fix bug 5623642 - Status bar background incompatible with some legacy apps" into ics-mr1