Merge \\"QS: Don\\'t disable hotspot animation when leaving airplane mode\\" into nyc-dev am: 8c9b6609f1
am: e91051b206

Change-Id: I0037c7560e5655c4e213e70ce9878c34ee029b49