Merge "Add setting to disable PIN animation and password"