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

Change-Id: I58f238896ab1c5591c3f7683e28b640f6f584d0e