Fix volume adjust on rotation

For real this time!!!

Change-Id: I51d48a6823a24e8901703a52ed17268168cb7a37

(cherry picked from commit 7837fced89e1f9fc188b87ab2586b79c802d68e6)