Merge changes Id57adff2,I8b523c9f

* changes:
  Fix some entrance animations for new QSHeaders
  Add privacy indicators to combined QS header