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