Merge "Set default for Block::appliesToPasswordReset to true"