Merge "Added safeguard to make sure Panel is visible when unlocked" into qt-r1-dev