Merge "QS Footer: Don't update icon from wrong thread." into nyc-mr1-dev am: aedfa81517 am: 1d2ef7f1b8
am: f958749376

Change-Id: I0b9c7cb7063291914486dad711bde5a2ddc39a7d