Merge "Adds flag argument to setMasterMute." into ics-aah