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

Change-Id: I04162c4df9c04d358fab20c3709fb5c58d2173dc