Merge "Check and configure pixel format when locking canvas" into qt-dev am: f8d04b2d2f
am: 6c0d305f35

Change-Id: Icd858aff2e6e8fadc9834d2aeeb9da18b83ce034