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