Merge "Kill foreground apps when turning off work" into nyc-dev