Merge "Fix virtual display nesting"