Merge "Improving diagnostics from fallback recents tests when phone is not unlocked" into main