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

Change-Id: I85c390f99600d4f6cf75c9b3a4b1c39e7b874335