Merge "Prevent duplicate calls to show indicator" into main