Merge "Layout changes to recents" into ics-mr0