Merge "Remove support of disabling Jack."