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