Merge "Reduce screen layout in task override configuration from its parent config"