Merge "Make Recents button work in demo mode" into nyc-mr1-dev