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

Change-Id: Ia1fd6ab09d6310575bdbceba1d56f0a58160331f