Merge "Relaunch previous activity after turning work profile on" into nyc-dev