Merge "Remove CONFIG_SCREEN_LAYOUT from InterestingConfigChanges params"