Merge "Not waiting for animations for Launcher clicks" into tm-qpr-dev