Merge "Adding flag for disabling search bar."