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

* commit 'a8c1906a9d318f428d2022b7d732c0c7e029a96d':
  Disable hardware layer on custom screen