Merge "Fix volume expand arrow to be displayed correctly"