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

* commit '6a16825272cca86484d8db88b376b1a42131a8d5':