Merge "Auto-encrypt drive at startup"