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

* commit '6b0244485c1d20261cffb0fbabebdfefd701867e':
  Fix 5493266: Properly restore background after playing music