Merge "Move legacy full disk encryption code to Settings." into nyc-dev