Merge "omni: PoorMansTheme: Messaging: fix white text on white bg" into android-9.0