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

* commit '192ca56d7a0c8a1a776bd8f9539c49f4b8ce3372':
  Prevent overlap of color views in landscape