Merge "Add back music configs inside OOF HEAT script"