Merge "Use correct array index for Theme.getTheme()" into mnc-dev