Merge "Persist screen brightness setting through upgrade"