Merge "Volume dialog touch-tracking is disabled when in zenMute." into oc-mr1-dev
am: 0951dbd00d

Change-Id: I0658524b2f0d260ec2dda57f0f44f52cd312fd16