Merge "Fixing QS not visible when opening split shade with adb command" into tm-qpr-dev