Merge "Settings: Change an assert in test"