Merge "Avoid going to SHADE_LOCKED when already in SHADE" into qt-qpr1-dev