Merge "Update disable app warning text"