Merge "QS: Update layout to show gear all the time" into nyc-mr1-dev
am: cb9446453c

* commit 'cb9446453cee802819498348d265d0217878e47f':
  QS: Update layout to show gear all the time

Change-Id: Icda1fccca3583004f3f58b86e844e7f39b355763