Merge "Introduce ButtonInterface and getHomeId()" into nyc-mr1-dev