Merge "Update indication whenever locked state changes" into qt-dev
am: 9414216e61

Change-Id: I85b37f1386de364bfc54bb4ae2d8e158726e67a7