Merge "Fix volume problems with insert revert" into gingerbread