Merge "Fix creating of app theme snapshots" into oc-dev