Merge "Unlock icon regardless of transient error" into qt-r1-dev am: ce22fb44d9
am: 736f63e16e

Change-Id: I44430bdad67552f5929d54dc406dd7d799d7c668