Merge "Fix bouncer to launcher/app animation" into sc-dev