Merge "add TYPE_PRIVATE_PRESENTATION window type"