Merge "Better focus handling after dismissing task/scrolling." into nyc-dev