Merge "Fix NotificationCompat.MediaStyle crash on ICS" into lmp-mr1-ub-dev