Merge "app: recovery: Handle partition not found error"