Merge \\"Quick settings icons have focus\\" into nyc-mr1-dev am: d3ed87b222
am: 3492b5658f

Change-Id: Ib9bc3a32243daefc74012ecfe6ff92fb833eea30