Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0