Merge "Revert "Fix security vulnerability allowing apps to start from background"" into main