Merge "Use default theme for test activities" into mnc-dev