Merge "Provide data to LockScreenSafetySource" into tm-dev