Merge "Fix creating of app theme snapshots" into oc-dev
am: 0418b72fd2

Change-Id: Ie78316a83a83ebb8a01698a74e01fda634a1d09f