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

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