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

Change-Id: Ibdf19d559d4485ec4d0084470290f1f8fe4f841f