Merge "Reduce screen layout in task override configuration from its parent config"
am: 6e12301e84

Change-Id: I10c2b9ca8be4eacda364a71e3a445cd57e8b93a0