Merge "LockIcon: update content description when config changes" into oc-dr1-dev