Merge "Fix issue #5144065: Tap on Music icon from Home screen..." into ics-mr1