am bf6f081c: (-s ours) am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev

* commit 'bf6f081cda7360810645cf6bf932687df1cfae00':
  DO NOT MERGE Hide the volume panel for watches for now