Merge "Change order of calls to AudioManager"