Merge "Revert "Refactored layout of QQS and transition animation.""