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

Change-Id: Icc1eb2e91bfd3977dce8608e603cb55a0841a3d9