Merge "Improve wait for splitapp loaded before trying to execute it"