Merge "Don't start Android Beam Activity if feature is not supported"