Add back Flip/Shake options to 4.2.2 source

and fix build error with updated increasing volume patch