Merge "Volume: Improve inline volume controls used in settings." into lmp-mr1-dev