Merge "Re-add DO Disclosure text to lock screen; now faded." into rvc-dev