Merge "Use the current dimensions instead of relying on onConfigurationChanged" into sc-v2-dev