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