Merge "Merge "Themes: Apply themes to system_server safely" into oc-dev am: a52fc49845 am: b188c93a45"