Merge "Re-inflating view in onConfigurationChange"