Merge "Refactored layout of QQS and transition animation."