Merge "Don't show UI on default encryption" into mnc-dr-dev