Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev