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

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