Merge "Return correct default theme on API >= 24" into nyc-dev