Merge "Fix volume dialog dismiss animation" into tm-qpr-dev