Merge "Check if smallestWidthDp doesn't change during rotation" into nyc-mr1-dev