Merge "Add setLandscape() method to ButtonInterface" into nyc-mr1-dev