Merge "Fix app launch time regression"