Merge \"QS Detail: Don\'t animate switch before panel open\" into nyc-mr1-dev
am: 9716690e2f

Change-Id: If807c7c7e08103c882af67b5539cfbc8fd96505e