Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev