Merge "Check and configure pixel format when locking canvas" into qt-dev