am 2ef571da: am a8c1906a: Merge "Disable hardware layer on custom screen" into jb-ub-now-indigo-rose

* commit '2ef571da1e4c71f0c39b73b17f12f5bf80629899':
  Disable hardware layer on custom screen