Merge "Switch display control betw. Android and Sidekick"