Merge "Make debug.layout usable with hw acceleration on" into jb-dev