QS: Layout and animation refinement

Bug: 29315917
Fixes: 29879993
Change-Id: I0153e81ff9cd81022958a1baf3531ac5ca6b4144
7 files changed