Merge "DO NOT MERGE - 2-dimensional Recents activity. am: c13df1eb30" into nyc-mr2-dev-plus-aosp