Merge "Improve volume touches"