Merge "Fix letterbox and orientation request on DisplayAreaGroup"