Merge "Volume settings refinements as per designer feedback."