Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev