Merge "Handle adjust volume user restriction" into mnc-dev