Merge "Support exit to full screen to non-split app" into tm-dev