Merge "Dark theme upgrade broken" into rvc-dev am: e95887d548 am: 4a630712c7 am: d6edabbb1d

Change-Id: I374521ee98fc3ce99399195655bf72cd566d3984