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