Merge "Fix NPE in obtainThemeColor due to use of Mocks" into sc-dev