Merge "Defer some heavy work from final frame of app -> home transition" into sc-dev