Merge "Prioritize verify app not enabled error" into main