Merge "Make AOD RON secondary text also pure white" into main