Merge "Make apps able to run with a failing patchoat" into lmp-dev