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

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