Merge "Merge "Hide lock icon while WAKE_AND_UNLOCK is happening." into qt-dev am: 14ca66a7c5 am: abd938a846"