Merge "DO NOT MERGE - 2-dimensional Recents activity." into nyc-mr2-dev am: 954347fb1b
am: f1743ea000  -s ours

Change-Id: Ie91c89b8d71e7e6981502f5079d113ead77b0640