Merge "Don't show 'unlock at boot' for file encryption"