Merge "Improve Apps/Widgets transition" into ics-mr1