Merge "Update settings notification ui tests"