Merge "Persist master volume mute across reboot" into nyc-mr1-dev