Merge "Add workaround for ContetxtImpl.setTheme(), verify test setup" into mnc-dev