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

Change-Id: I34c49818890e02410329ba8e59073d452764670d