am e77660d7: am ea73528c: am afdfc2c0: am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev

* commit 'e77660d7f4e261f21e9d8d2098c451d55ccbc533':
  Prevent overlap of color views in landscape