Merge \"Make Recents button work in demo mode\" into nyc-mr1-dev
am: 9f311f6827

Change-Id: Ife4a233149a90678d2ac55d473ae32a05020666c