Merge "Revert "Vega: skip themes at the right place"" into gingerbread