Merge "Fix music volume regression on tablets"