am f7f6e4bf: am 060d5fd1: Merge "Adjust power control widget minWidth to occupy 4 cells." into klp-dev

* commit 'f7f6e4bfc6e9dbfb8b2b22875e62a5bfa8e1a82a':
  Adjust power control widget minWidth to occupy 4 cells.