Merge "Fixing issue with search icon and new intent flags."