Merge "Remove workaround for wrong search icon in landscape."