Merge "Update indication whenever locked state changes" into qt-dev