Merge "[DO NOT MERGE] Do not dismiss volume dialog onAnimationEnd while dialog is showing"