Merge "Provide content description for WorkLockActivity." into oc-dev