Merge "Retire PFLAG_ONLY_DRAWS_BACKGROUND." into mnc-dev