Merge "Prevent activity selection dialog spam"