Merge commit '5f64128568d815f91dcd37db43d4e26a0566b41c' * commit '5f64128568d815f91dcd37db43d4e26a0566b41c': Fix issue #2364506: Phone locked up while listening to music and attempting to download an update
Merge commit '5f64128568d815f91dcd37db43d4e26a0566b41c' * commit '5f64128568d815f91dcd37db43d4e26a0566b41c': Fix issue #2364506: Phone locked up while listening to music and attempting to download an update