Merge "Fix jump in app launch when quick switching from Home" into main