Merge "Avoid potential ActivityNotFoundException" into main