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

* commit 'd75f95adb5d3b4275bbd7698e5c5224a34ec412a':