Merge "Improve messaging of pre boot apps."