Merge "Avoid going to SHADE_LOCKED when already in SHADE" into qt-qpr1-dev
am: 01047d0372

Change-Id: I35947a507d4fbbb5254ce32eed33a94fc4b5720e